From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 14 Jan 2013 17:38:02 +0000 (-0500)
Subject: workspace, workspaceThumbnail: Fix another bad rebase
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4933
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d2c45f428f7dfc5b78ec07b7e16e40f700230f6f;p=gnome-shell.git

workspace, workspaceThumbnail: Fix another bad rebase

It seems I pushed an old version of the patch by accident.
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 8342b1883..abc0cb440 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1531,11 +1531,11 @@ const Workspace = new Lang.Class({
         this.leavingOverview = false;
     },
 
-    // Tests if @win belongs to this workspaces and monitor
+    // Tests if @actor belongs to this workspaces and monitor
     _isMyWindow : function (actor) {
         let win = actor.meta_window;
         return (this.metaWorkspace == null || win.located_on_workspace(this.metaWorkspace)) &&
-            (!win.get_monitor() == this.monitorIndex);
+            (win.get_monitor() == this.monitorIndex);
     },
 
     // Tests if @win should be shown in the Overview
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 03d1fc002..987c886ff 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -380,11 +380,11 @@ const WorkspaceThumbnail = new Lang.Class({
         this.actor = null;
     },
 
-    // Tests if @win belongs to this workspace and monitor
+    // Tests if @actor belongs to this workspace and monitor
     _isMyWindow : function (actor) {
         let win = actor.meta_window;
         return win.located_on_workspace(this.metaWorkspace) &&
-            (!win.get_monitor() == this.monitorIndex);
+            (win.get_monitor() == this.monitorIndex);
     },
 
     // Tests if @win should be shown in the Overview